From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 21 Dec 2012 16:04:57 +0000 (-0500)
Subject: keyring: Don't use setButtons
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5150
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ac202cbdd376231a5a03b861e3dcb57cfce85150;p=gnome-shell.git

keyring: Don't use setButtons

https://bugzilla.gnome.org/show_bug.cgi?id=690594
---

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index ef53c0b42..74c9c382c 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -60,18 +60,14 @@ const KeyringDialog = new Lang.Class({
 
         this._controlTable = null;
 
-        let buttons = [{ label: '',
-                         action: Lang.bind(this, this._onCancelButton),
-                         key:    Clutter.Escape
-                       },
-                       { label: '',
-                         action: Lang.bind(this, this._onContinueButton),
-                         default: true
-                       }]
-
-        this.setButtons(buttons);
-        this._cancelButton = buttons[0].button;
-        this._continueButton = buttons[1].button;
+
+        this._cancelButton = this.addButton({ label: '',
+                                              action: Lang.bind(this, this._onCancelButton),
+                                              key: Clutter.Escape });
+        this._continueButton = this.addButton({ label: '',
+                                                action: Lang.bind(this, this._onContinueButton),
+                                                default: true },
+                                              { expand: true, x_fill: false, x_align: St.Align.END });
 
         this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);